Merge "Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. am: a74a6e5b am: cabb54b5 am: a9a3d22c am: 63019662 am: 2376ece2" into nyc-mr1-dev-plus-aosp
am: 4730e6bd

* commit '4730e6bd':

Change-Id: Ief409deeb0cefa41715115f281e62325531391e0