Merge 9b79917f8b3124404abb76522cb52bdeb207c5b4 on remote branch

Change-Id: I51225de4de69f449f7661976f0a1edc20661de91