Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 47b8a77785  -s ours
am: 8f5d27f229  -s ours

Change-Id: Ib825dcd91999402d4ec96e125fececf0d85e7567