Merge "Add new intents, extras and constants for provisioning optimization."