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

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

Change-Id: Ic26af3d904c52fb2373142c33ce20f81a6d520b5