Merge "Import translations. DO NOT MERGE" into mnc-dev am: 3006c1473e  -s ours
am: dcbf728ab3  -s ours

Change-Id: I612fc045e873867400e3aaeff973bf37762e980c