Some AOSP changes in L5, part 7, final