Merge "Make implicit intent immutable." into rvc-dev am: 6980483555 am: 8ccfcd23f5 am: 7ca3ae9d67

Change-Id: I217758e2239a4113a5aa7f1850cd07266c4eebf7