Merge changes I2f94f9a6,Ie58ecf2a,I56696fef
am: f3fc4891f1

Change-Id: I2de333c3f251c6ecf93e8e23cd6bab955de0e1e0