Merge "Update TV to show custom actions." into oc-dev am: 1a01d1298f am: f7bb25e8ae
am: d04b85261e

Change-Id: I27aa4b74690d0cc11144d3e4314b533bb161280a