Merge "Reflect changes from r.android.com/2426234 in the API surface."