Merge "Deprecate redundant event, should handle via NotProvisionedException"