Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42 am: 1581bb0b75
am: 443761ae57

Change-Id: I862284b43fe2aeb8ad5f38bb963d0ce30f29ea3e