Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4e3fe5c7d8  -s ours
am: 3f8d11d863  -s ours

Change-Id: I4145450d467c2631ea3642c90832148a9972958d