Merge "Add missing txPower parameter"
am: a6c1f6def1

Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a