Merge ccfa001e0b9897000bf9f84e40cf84a6260c8604 on remote branch

Change-Id: I50e919a08cb3dfb93d68b075376ab992b2c93150