Merge 9960326c2bfb0607d48e348faebc449decd60d84 on remote branch

Change-Id: I3d244ffd0cb81da2b77575de46136fc2df7242e8