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

Change-Id: I1d23e5ba9e061a50bea052b2eb6cb7114e99ff63