Merge "Add BatteryStatsValidationTest#testWifiUpload to failure list" into oc-dev