Adapt commands to new location of AccountGeneralPreferencesInfo Change-Id: I492d58adbc7d73e15f6d8c3ac51c6f3e238b6392