Merge stage-aosp-master into pi-dev-plus-aosp am: 5344bb3347 Change-Id: Ib86af3dbaf18f91accb7a52153c7a323fb629bbc