Merge 6617a264823c3487e721033197ecf5c510705bd6 on remote branch

Change-Id: Ife2b991f42a69a7f55011d48e4e3c115578c5e5c