remove a mixed style (**{} and param=value)

There are a mixed coding style of "**{param:value}" and "key=value"
in some places. These would be misleading for following developers.
Removing this could remain a clean and clear coding style here.

Change-Id: I92df99e943f76c1c1dba4672c4b59f65ea2b1f06
Merge "remove a mixed style (**{} and param=value)"