Merge "Reverse-merging master to AOSP."
am: 990c9f278a

Change-Id: I7e3084c019753b05f324f26a8ac8c12caf7c9f1b