Merge 0eef98abd6fd31f62ba9d007ef480ada1856864c on remote branch

Change-Id: Ib11fa6acb330806fd7adf5433f33da94572981f9