Merge changes I6145bae8,Ia9452b3e
am: f37948d659

Change-Id: I784a5c9ebada3f58ff73875ca5a971756dcbdf52