am: cabb54b5 * commit 'cabb54b5': Sync jd_extras/jd_collections with jd_extras_en. make a few minor updates. Change-Id: I7ab0c1bddb67f7c6a68cd16b856c9083e2747a8c