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

Change-Id: Iaef81c1d81f772099ef22f99e665e16b11d4f0af