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

Change-Id: I87803e72b2bbd5638e29405f76d58545fb3fdb2f