AOSP changes from TeamPlaceHolder