Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fc9ad02469  -s ours
am: 3f578ad25e  -s ours

Change-Id: I5c6fef42bf0443d7a451531e311a620d14c0c0dc