Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev