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

Change-Id: Ia049ef0aa8cd9fa720e9899d923d7f09c445e03e