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