Merge "fix build by restoring deleted enum" into mnc-dev