Merge stage-dr1-aosp-master into stage-aosp-master
am: bc4868b607

Change-Id: If37fa3aa1a317e59534a8d7266760615718af446