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