Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am: bb6653c404 am: eebd877904" into oc-mr1-dev-plus-aosp
am: 94e946b0b4

Change-Id: Icb893ae106d6dd70b4c493d2c0a727069ff857e0