Merge 5b2051cea6cf32083c5f6d2680a6fdf9ae4a6860 on remote branch

Change-Id: Ic677d4182b452b5655b408d0f35a96a58e6aaecd