[automerger skipped] Merge "Move ApplicationInfo to params in AppComponentFactory" am: 96dd06a151 am: 13a48e1490
am: b2754164d8 -s ours
am skip reason: change_id I4a4d5af842446a5060083c88a0ac5bec014c0c55 with SHA1 33bd343596 is in history

Change-Id: I7e31dd2e32a81b1ea813b7764a2ec52d2a277428