am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1

* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets