Add default params to avoid massive if/else block

Change-Id: I966d16525220565e805fda582c5f88a7978faa37
Merge "Add default params to avoid massive if/else block"