Merge "Move battery usage files to a separate folder." into tm-qpr-dev