Merge 79a40143b1dec051fc5ab31fd186fdfc842f00e0 on remote branch

Change-Id: Ib5b24ecb2b915678d2808d4fc8647e71b64143ac