Merge 0e9369a6c035d08950b9491f36dedadc8b6ebf46 on remote branch

Change-Id: I3bbc4a1973ab0b27f7516e3e00f365a37511c391