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

Change-Id: I841d27de83656a1f8b3bf279401217348569fea7