Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100
am: adca091fcd

Change-Id: I49afd37a236925b59ac84fe4b620e2a93baf0686