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

Change-Id: I52852e561ea0f5fb5b2e2897093c08f105775d98