Merge changes I6618561d,If9479cd9,I3e13894e into pi-dev

* changes:
  SF: Test coverage for EventControlThread
  SF: Test coverage for EventThread
  SF: Test coverage for setPowerModeInternal