Merge "Fix reporting of wakelocks to battery stats." into mnc-dev