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