Merge changes I80ff3852,Ibe1c57bc,I93f35850
am: 3d198bb28a

Change-Id: If18065423509c5bd8caf0de8440646401e7b2c8c