Merge stage-dr1-aosp-master into stage-aosp-master
am: 76dd3b23bd

Change-Id: I8d27d1a7432c7dc86b1adb84c9c0aa9eea7ae17e