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