Merge changes I81796b45,Iaf585336 am: 437bbed858
am: aecdb6a3e5

Change-Id: Ica8bef18a5f0799b3339d1e6bfdc927e7f8ff5a1