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

Change-Id: I7740f6dd65ef5b678e03bcc67516591fc73965a4