Merge "Reverse-merging master to AOSP."