Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread