Merge 1880ff783c1cff336f0697502c759eb328054762 on remote branch

Change-Id: Ied7d49fb0953006351b95f3731f158e8902ec225