Merge "Export battery usage data for EBS essential list filter mechanism" into tm-dev