Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb