Merge "Report swap metrics in bytes"