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

* commit '1586c133a3305045af277b69fec6f0f14bb234df':
  Fixing naming for disabled paste assets Updated paste assets