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

Change-Id: I81830a6d826cd109c99f6e857204f96da9d4a656