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

Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd