Merge 1341a83a443ac2df9e71d3da56e338d209f75856 on remote branch

Change-Id: I6be62cd6cc380c3519a3a7896e8526ebd7444c8f