Merge stage-aosp-master into pi-dev-plus-aosp
am: 710abbd197

Change-Id: Ice42658c8b2f240e725b389535a546b5ce3b2bef