Merge "Use invalid package names for special keys in AccountManager." into oc-dev