Merge remote-tracking branch 'coral/staging' into staging-merge Change-Id: Idc5db33a9e8cfcbfb2491998ac2c4ba4a693fc40