Merge "DO NOT MERGE Make intents immutable" into oc-dev