Merge 4915e4f0ba76c4f20bb04dcb987bb53e5df1ebc3 on remote branch

Change-Id: I73ddb65d6c77a3555842e57713a1300dabbb305f