Merge "Revert "Add Extra Parameter for Intent"" into udc-dev