Some AOSP changes in L5, part 6