Make parameters with default value  optional

Change-Id: Ia0130d283ff70b89a7bf46f26286fc9a6128cae3
Merge "Make parameters with default value  optional"