Add option for controling app image class initialization am: 5132e0d143
am: d4f2257aa1

Change-Id: I618a3c0b8890b81fcf56070cd45b734600387037