am 58f0bc3d: am 280e9c2b: am 49d5ca18: Merge "Updated calls for LauncherApps renaming." into ub-now-porkchop

* commit '58f0bc3db0155de722067b3d563db97884eb4c0b':