Make intents immutable am: f4619d699f am: d827b988b1

Original change: undetermined

Change-Id: I87687c4fae38156bf2b6ee6fb7a0fb624f331ef3