Merge "Update comments and bump batterystats version to 30."