am 3dcdd9f4: am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-dev

* commit '3dcdd9f47ae4bae22e67dfe072925e589aac6fd4':
  Specify Locale.US for stringification of enums