AOSP catch-up again.