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

Change-Id: I0da0ecb0ed9430e059bc13e73226d43275bef934