Merge 0bcee07eb36b10b5efc65b7a03445404be1ec217 on remote branch

Change-Id: I8a0cf39247075fa54388d4bd56a0e12c554b1855