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

Change-Id: I86dcbec7bf5c50217f3bf7321ce611af8b238f71