Merge stage-aosp-master into pi-dev-plus-aosp am: dfedb81dd0 Change-Id: I7981493ce9f369838976397c3f6f19fe0d2b06e7