Merge a8045c89617505df7e97c5a3cb6a4e7051689b97 on remote branch

Change-Id: I8712f2542c61df35abbbfed285bd0483687eba6d