Merge "Make implicit intent immutable." into rvc-dev am: 6980483555 am: b29d19a488 am: c0fcce7814

Change-Id: I73422ef0ad63e8d82287b353f1c5977f6fde93bc