Merge e0294e3ea932db74752afb4626d311f233c7d4d9 on remote branch

Change-Id: Id2432c2a3cf473996a83695a073a22e9b6f088f5