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

Change-Id: Ie15dabd5cf3f53b447565a5a6472c32a7f645588