Merge changes I4af73809,Iba6a564a,I3305b71e
am: 5640e1d836

Change-Id: Ia0bfa4b3135a12f2e38438f192baa6ebb641bc4b