Revert "oops"

This reverts commit 0659732559b3f8f2ddd9021f1ff7c865a4598f85.
Revert "Revert "Battery optimization and build flags revert""

This reverts commit 6082b6b5930dc6a678271353f3b66d1b1ed42591.