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

* commit 'efd94f33a32ca8bd05ba599caaa8ac0e531c72f9':