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