Merge "Clarifying some battery saver policy variables."