Merge 459f12356a849ff957cf795919adbb5180604f55 on remote branch

Change-Id: I8cbc4652e35c2b046b68ce065321cd93ea8a4e8a