Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. am: a74a6e5ba9
am: cabb54b570

* commit 'cabb54b57094b3e897df90b17d3a6b1c29cfd988':
  Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates.

Change-Id: I7ab0c1bddb67f7c6a68cd16b856c9083e2747a8c