Merge changes I547d1950,I7b958a9f
am: 394bfabc87

Change-Id: I5107aab77c5599ef3d7a0c5566d666d751b78849