Merge "Removed unused mount mode constants"