Merge cc5027c565c55819e78a9c6df636a829261673c8 on remote branch

Change-Id: If2263cd8b632d4b658c83129ba8b56b24121f298