Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread