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

This reverts commit 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7.

Change-Id: I9abfc39974fa42edcc1eb6b6ec2e53782b4fcf5f
631 files changed