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

Change-Id: Idad1acd2e39c14ca3aca9c2f95042389161d18ca