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