Merge "Fix PlaybackGlueTest on v17" into nyc-support-25.2-dev am: 28ddb9a0ba
am: d26db9c563

Change-Id: I809c77d0193d9ec504393cea4d45dd4768a0942f