Merge 7acb287a7ee28f669e67dea0995fde284803c011 on remote branch

Change-Id: I012f016239d9a9f55604ae205e10297d8c91345d