Merge 171b18768b9afe90d7c59ce606f66cc95ac098b9 on remote branch

Change-Id: Ibe1a423720b08e270cb019f3109ec07e75263b3b