Merge stage-aosp-master into pi-dev-plus-aosp Bug: 126125118 Change-Id: I128c0bcfdfca76795c45956365858c5f3cc272d1