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

Change-Id: I528b9902377c393268e32306f9b1908b8bc44a02