Merge "fix TV device feature checking." am: 595b1e1b7d
am: 6f315e6ffc

Change-Id: Ia1ad64d26d381d4903df6f3f968b3ae857a14d2c