Merge 710263d692414978bd1b386325e7c822a778d715 on remote branch

Change-Id: Idcf49bc13e8679e95edd6a4e7e994a0259ca2e2d