Merge ad9358c8d2a9acb54104cfb2a1bc035a10f3f863 on remote branch

Change-Id: Ic0120cb82758f66508cd4dec291e9027a9794229