Merge "modules/power: Silence compiler warnings" am: cbd7b77367
am: 161beacc8c

Change-Id: I6c0687d79e04c5c5ec752e6aff111e25ca0658be