Merge 8061fec51a290433ce6d8e896ecfc87056737d8b on remote branch

Change-Id: I0ab5b35a7a2228da106405bdc20fad9e818d6d13