Fix power related issues

Change-Id: I7d3d160306921f919fe53c70f07861447c645c7d