Merge "prevent runtime restart loop in charging test"