Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am: bb6653c4 am: eebd8779" into oc-mr1-dev-plus-aosp