Changes from AOSP
ste