am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am: e7599d6943

* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':