Merge 05cbc9469651eb056c5925cab40e1bd912d80cc2 on remote branch

Change-Id: I40da3a01ffdeaf2c3aa63fec8d403e5cfc91ad91