Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384  -s ours
am: cccb304acf  -s ours

Change-Id: Ic9fa84f60261dd11093f38c3e02845dc3da2a3a2