tree d31e2adc1f9cce4f27ca07d30bee921032e33a3c
parent 8240a88ba4469279d99444bcd08eebdc1c0dc5d8
author Nick Chalko <nchalko@google.com> 1507050997 -0700
committer Xin Li <delphij@google.com> 1509489586 -0700

Sync to match Live Channels 1.15(ncis)

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Test: build with support-27.0-dev branch merge
Bug: 68345297
Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)