Merge "Move ApplicationInfo to params in AppComponentFactory" am: 96dd06a151
am: 13a48e1490

Change-Id: I2272a7f640a7ddde5002b7dd1bdf178d20db9ad3