Merge e3de05290ececda045a1cfe7db577a835eafb2cf on remote branch

Change-Id: I1092ec40b0a596de9406f6f17dc4e5311db1d093