Merge 5a8a4b6269337a4b1d2fe3723dad44104d2e3e82 on remote branch

Change-Id: I6006d15013544e80fedf53684f0425200c4a1e17