Merge "Merge "Add a common call when wrapping an app." am: 12e09759 am:...
Merge "Merge "Add a common call when wrapping an app." am: 12e09759 am: bb6cf84a am: 1d10ce12" into oc-dr1-dev-plus-aosp
am: 68a974ef
Change-Id: I6f20da639b79e63fbafd71c7a365054493e86e45