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

Change-Id: If2743b679e9ba52e680f79349656629facb9cd0a