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