Merge "Fix battery stats validation CTS tests"