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

Change-Id: I34704180cd06f5b73c9933381694a2a541c2b2e9