am b3c61229: Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev

* commit 'b3c61229ccf38ea3f398f93902d348ba12a7fb07':
  Code cleanup - remove unnecessary commented out code