Merge b22c2607279a64389cdc29791f78f75ccd9e7777 on remote branch

Change-Id: I225bb2dd9411eb581131c3835d1a4e28b1be2e7b