Merge 72278b1a25bf168a012e37ed1bb170a946d3bc55 on remote branch

Change-Id: Icfb6c6f4b2076a6f732910fc3d5b0abe37968443