Merge "Remove redundant dependency" into nyc-support-25.3-dev
am: b0b5275fd8

Change-Id: Ia941392aa87140b1e2d35b4866e2a294a04933a4