Merge stage-aosp-master into pi-dev-plus-aosp am: 25c16242f0 Change-Id: I05c34bffac3785efeb71bb7ca67b83763d210b7d