Merge "Rewrite LocalIntentSender"