Merge 9cc6013e0b0f708b444115f328bc58dc674d8109 on remote branch

Change-Id: Ibf0754418d4c10b669794f431a75f036e887acb6