am e0e6612d: am 33372b21: Merge "A few updates for TVs." into ics-mr1

* commit 'e0e6612d30308a68c107d517582eb68f0e4caa99':
  A few updates for TVs.