Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

Change-Id: Id0053752db7bc304d02b78d04055b86b5e5e8ad5
4 files changed