Merge "Changed tag name and error strings for PersistentPreferredActivity storage."