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

Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d