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

Change-Id: Ifc6946e94bbaf9509be09071890f5a374e1c99ff