DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Bug: 28469968
Change-Id: I74e368f5f58b433755932b806a90178e37bea7f9
630 files changed