Merge e8ce99f138e3927031cd5a07212ee4773b5bbfef on remote branch

Change-Id: Ie53c90bf65cac90d1026973e6b204f02707cd0c3