Merge changes I8f33830f,Icd2b891b,I8736ff5c,Iae6e342a
am: 1c65e77e6d

Change-Id: I886dcc26c8dbc51c67011452ee615a95456385c7