power: Additional guards

Change-Id: I67f8ffc55e734ada251e42b4ed50bc038f63b3d2
Merge remote-tracking branch 'cm/cm-11.0' into HEAD