Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev