am fbb31b4a: am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev * commit 'fbb31b4a':