Merge changes I5482a45a,I0185e169,Ic17c5e1d
am: 06d5da59ac

Change-Id: I244cdac039ff847e2269053969b13a5754c16865