Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 362113588f  -s ours
am: 28a51455fb  -s ours

Change-Id: Ib8f84c6fb015b6c021e31c999bf5a327155a2a50