Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb
am: 78d5ea8e9b

Change-Id: Id0ba6f9c089d1c59d119ec39e1fae1e0b70ac03b