Merge 81dac300284441b59a2cf0f47dc24750e6b51c15 on remote branch

Change-Id: I7a3f1c9f3907afe7765a84df5bde189f1318e477