Fix Design test on TV am: f16fff9d2d
am: 86a664690a

Change-Id: I8b29585d4731fd377dcbc7080ad565f2c26d0e52