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

Change-Id: I7224af4db28368292609a6c7728bcfd9a299b784