Merge 0ecb265c960cac127559d0c69776a3fcef6f56e2 on remote branch

Change-Id: Ia836e10068cc1f46101c6bcdcb4eafe02145830b