At least the changes that don't conflict with 4.0.1 Change-Id: I9b6a7c14dadc0738cd0f628a10ece90fc7ee89fd
Change-Id: I3ea3e77364879928bd916f2b0a7838073ade5975
Change-Id: I4aceffcdf7af59ffeb51984f0345c3a4c7e76a9f