Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9353cf10ba  -s ours
am: c45aaf531c  -s ours

Change-Id: I1b8c9850be3bca353df1f8d51c7ae0d26404b6e4