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

* commit '2126508d20d5ee9e5d5c8dbaf63286421fcddb38':