Merge ca45e4922cbe6a3eda91acfb392212d3ededfe62 on remote branch

Change-Id: I79b26ea6dfea3c0005abc146140f132fb6ae548a