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