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