Merge "Fix IllegalArgumentException when using NUM_TRACKS or YEAR metadata on API14-19" into lmp-mr1-ub-dev