Merge "Keep internal/aosp code in sync"