Merge commit '09173387a12e70708e0985aeb461ebbbd8a84fe5' from nyc-support-25.1-dev to
stage-aosp-master.

Test: local build tests
BUG: 34107289
Change-Id: I1dff75f96b55e1aae8bc667840cf13aa129e38d5