Merge stage-aosp-master into pi-dev-plus-aosp
am: 7be309e143

Change-Id: I848b312711b285f0d548ab9a6708d7845b308e72