Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d74b5f551d  -s ours
am: 5871f5ec47  -s ours

Change-Id: Ide5be834d46fe28c499382b756a64530881ac883