Added missing memory tag and cleanup memory type enum Reviewed-by: shade, coleenp
Reviewed-by: adinn, zgu
Reviewed-by: darcy, ihse