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