Merge stage-aosp-master into pi-dev-plus-aosp
am: 0fc8aefe86

Change-Id: Ibff781f10682c6ccaac9f578c607aceb66bef731