Merge "asanwrapper: remove all environment editing." am: a76ee7fb16 am: ac9be9e8c3
am: c055141414

Change-Id: I372de72da5ca57ab72bd77780a562c887342ba96