Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33 am: 919e1ed7e9
am: 7807da8282

Change-Id: Ic4f5ba3de6e4cd9d5da8622406736624d920fa5f