Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am: bb6653c404

Change-Id: I4e0dbda0e13e5419abfa25e2719d8fdcea0fa047