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

* commit '2eed7ab0e5d81c0025737c6ce9931f3d8b57b418':
  Specify Locale.US for stringification of enums