Merge "Add a common call when wrapping an app." am: 12e0975963 am: bb6cf84a40
am: 1d10ce12ff

Change-Id: Ib814bcfc56ad6742a023bd7245952cefd51d5fd2