Revert "more fixes to power"

This reverts commit 0ee72ac7674edcc6b93687764f06942dbad0dc05.

Change-Id: Ib0daaae8c4fa272606eb429f9ca7a981917c5c6c
Merge "Revert "more fixes to power"" into kk_2.7-stable