Merge 80cd79d0760a32353e9a14a5d0faa0c88954d8a6 on remote branch

Change-Id: If3c41a183f9dc29c913118825a2150eea9151d15