am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev

* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563':
  fix build by restoring deleted enum