Merge stage-aosp-master into pi-dev-plus-aosp
am: f889723bbd

Change-Id: Idf617e80d6ee9f136f951822ae94a0effbb69fc0