Merge commit '62ec2dd5' into mm

Change-Id: I34801df36735545fc500486209573ed2864a0430