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

Change-Id: I7e9894a2f81c310bb8cd85cf65e17a5481f9de01