Merge changes If205af43,I1d1e8a26

* changes:
  Fix E2E tests
  Implement handling for CarPowerManager interface