Merge "Allow extra slop in battery stats" into mnc-dev