Merge "Increase helm deploy perf by reducing helm ls"