Merge bb7a15701e44ea24233420ddf5e2f72700cc4599 on remote branch

Change-Id: I6062ef189d8416c15020288d022b4546fa098cc8