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

* commit 'f6e5b0c54f700c4bccec577d1549204ca7adc760':