Merge "Fix Design test on TV" into nyc-support-25.1-dev
am: a5c4b30b4e

Change-Id: If8165d856a984180ccd4ada42feba54c2ea4b779