Merge 0d6560159d10fd54135204c284250a301361b9b8 on remote branch

Change-Id: Ia9b3489f6dc2dd710cd862da0f09b5afdd5536c2