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

Change-Id: I50f9de63b8e1e46226a584411d547c6fb409faff