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

Change-Id: I2592c93b5df4b8d50bb0c9ab33462f34dc283069