Merge stage-dr1-aosp-master into stage-aosp-master am: 20cc266057
am: 657da78778

Change-Id: Idc234ce63ae89a4904db36629d5595009e9980b6