Remove unused/mutable default args

Having mutable default args is a bad idea
(http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments).

Change-Id: Id941f259ff362f306582be5c2e4bdea133149491
Merge "Remove unused/mutable default args"