Merge "[Tree-wide] Remove pnda charts from OOM"