Merge "Fixing android.text.format.Time for non-English locales" into lmp-dev