Merge 7062ebc32db7d1fccbe28ce8d5c0022005528739 on remote branch

Change-Id: Ic3313c4cd136d6c22595d97b2eefa10360a1ab40