Merge "Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e1" into oc-dev-plus-aosp am: c2bc1f27 am: e999fa69"