am b8066aec: am 1debf97b: am b7cc4332: am c2e1e21f: Merge "Get rid of leftover assets" into ub-gmail-ur14-dev

* commit 'b8066aeca8f1474d63d57297e2043008a124239e':
  Get rid of leftover assets