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

Change-Id: I3403721ca4aabb53bb2eed3b8e6dfc3093fb3b5c