Merge "make wifi cellular params configurable" into lmp-dev