Merge e341acbb8eda4a375a95b9f895734b87e65b3497 on remote branch

Change-Id: If329f141cae452112c17f61d65fbe12a5417fc4b