DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4
am: 48dadb4924

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

Change-Id: Iba1583607358d7c01bdbf1973d8365d44de39297