Merge 5d7cde1a5498e1d734c367f4f12d6b1eefac4805 on remote branch

Change-Id: I1fd6974f75c602a7ca76fa652a618c36dc82dac0