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

* commit 'fa71583e15d1fda1b5fa51b22e0f8510082d5355':