Merge changes I5f3b98aa,I6077d014,I276dbb46
am: 92a4974663

Change-Id: I087d3ffceda3b274c2e2d49a592a2ef8df09b2b0