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

Change-Id: I944c449954876353c7e597fca19ac5fe00e62906