Merge "Sync with AOSP to make http://r.android.com/326568 merge-able."