DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4
am: 369b6a4092

* commit '369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7':
  DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Change-Id: I3f2057d022f2ce816398ccd3345575766b279549