Merge a652c38ff22de6b548ea17590192e21a3e24c1f7 on remote branch

Change-Id: Id6c4906faf2d0f3ecc42b223717c32b3e3ca6653