Merge b85640c20d47affef568b5c026c320e6692191b9 on remote branch

Change-Id: I77c2c4323cc5cdcde4fd5fc0fd6bae5f2dfd1259