Merge 4688a626271a08b23dcc56e209dec36f359a6ba9 on remote branch

Change-Id: I66aedeaf340c176353b682baa53d49957ba6068d