AOSP catch-up.

Great, they finally removed this!