Merge cdf34c20b63d8dd0b94ddb21cf51937e3a1d59e1 on remote branch

Change-Id: I240de1e5de6f56cafa802341ae5ea72ff6073405