Merge stage-dr1-aosp-master into stage-aosp-master
am: 5d8e0afd67

Change-Id: Ifa2dfbc4f9fb3d7ba6eced8fb484550ae4007a25