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

* commit 'cd2a5a15c0ff9df4e25056373202a235517d6427':