Merge e3de05290ececda045a1cfe7db577a835eafb2cf on remote branch

Change-Id: I22e3f493a9bed08df114ae1a7bd3b99c4c4da1cb