Merge 62a45872d7e2b79043a2755de385bdd71b8ed82d on remote branch

Change-Id: Ia6cad6b79e847b1767022240a9df1a807d45e159