Merge 5af4b6782b1d711fa9e756bdd085af72d9188954 on remote branch

Change-Id: Ibc77716653b58b14294ca0da34df42f1719094dd