Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a
am: 3f0a9dbf65

Change-Id: I45158becd88d1e38f492a3ad5023aa96fae5ccd3