Merge "param.h: whitespace cleanup" am: 29a89df9e2
am: a201789ffa

Change-Id: I5f48bf2a4cdf03bb9438baa08d27118fad80889c