Merge f4400de9648d81ace68f9d01e3ddca646907dd13 on remote branch

Change-Id: I5e6d57dea808ddeddd14f9754f242fc0f6a3c732