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

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

Change-Id: I681173818b4f7f4fa8e1d1182b7b30a91fefd834