Inline with AOSP master branch