Merge changes Id877da97,I449c851c
am: 6e4dbf2039

Change-Id: I49b1c707911281e25a56d888d253dec1b6672dcf