Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev am: ef08871d6b
am: fa88787309

Change-Id: Icf3f61c961fcd2684c9b32edd5617f0514445c7d