Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 45c9ba9c15  -s ours
am: 64a1060855  -s ours

Change-Id: I49ae7611ab760f7c9632f31ceaf57234a06cbf73