Merge 475f94edee90f8a0a7ff2729c2810587ebae8d38 on remote branch

Change-Id: If32d7a158ca354148cdf3535a33c8a87fe42f1a6