Merge remote-tracking branch 'coral/staging' into staging-merge

Change-Id: I23860dadf77c785e70d6ab0b37be68874ba8cb67