Merge 6a04e795cc9ed2b38527acd468eea9252cb6f139 on remote branch

Change-Id: I174f200f653c8850260fe82b9c31eeb3a88d81e2