Merge stage-aosp-master into pi-dev-plus-aosp am: 0e01d87593 Change-Id: I83ce519b864b8c2bf230234157928874db337b37