Merge 186d4d25e3c768128acf2df01010ecb0183cfdc4 on remote branch

Change-Id: I3991a21cbee61020768a52e2d64f87f9229c6d9b