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

Change-Id: Ic1935a6051c78ffba6b1963373dc784d711c1c53