Merge changes I888a268b,Ia5a3c0bb,I189841e4,I5ab8b0b0
am: ac52000e86

Change-Id: I78b22784f1ce8a230ac105146a8b6d2b4b0501f7