Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c527941449  -s ours
am: 51df670652  -s ours

Change-Id: I472ecff59c06ee733f639c292e8d44439678b4d2