Merge 06ab6e4b1603c03a9e2b12907279607a08236e92 on remote branch

Change-Id: Id296bcd0c03b99ec2b7e351d20d0ea1bbbb2650f