Merge "Merge "Add a common call when wrapping an app." am: 12e0975963 am: bb6cf84a40 am: 1d10ce12ff" into oc-dr1-dev-plus-aosp