Merge 3d0069c08183affc4c27b980404f8cabf8cdf3a0 on remote branch

Change-Id: I5ba77519da1f5135dd33629dc874cc75065dda0b