At least the changes that don't conflict with 4.0.1 Change-Id: Iaa2fda027b8ab2b023d608cf5ec7b377a72b851e