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

Change-Id: I25992dd78e6dc455ad78517d1b07d00befcefa1e