Merge 7754d8da7046839969c81465a3daba15fb8008dd on remote branch

Change-Id: Iafc7933f8dfeb7b61127cb1604fd944ed9b8235a