Merge changes I1148ab4e,I3e8c632d,I786d7281,Icbd87b35
am: da9621ce83

Change-Id: Iebe92dab10c9984205383fad32eea14329610c78