Merge 1e9892599ffcc71ef55cf46523f453565eb1d7cc on remote branch

Change-Id: I16e2cdd15115a4f8486687d350f7765f712294b3