Merge changes from topic 'standard-cldr-data' am: 95cbac5a98 am: 9f071b62f7
am: 257889879e

Change-Id: Ic21b999d7d08621129e9b6132a6388891da98b2f