Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev