Merge 9b79917f8b3124404abb76522cb52bdeb207c5b4 on remote branch

Change-Id: I983a9f60ad20465c3f1b216db44b6a9a3de5aedf