Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev