Merge "Add missing txPower parameter" am: a6c1f6def1 am: 43f71975d0
am: ac5adba90e

Change-Id: I0f7b282fb1a0d09742f8a8e9aca5a62b841adf0a