Merge c8174c09c40b244e88e52be9de53a7210bd3697d on remote branch

Change-Id: I590f0796a75126dfa82fa195f6a8f88804a7c656