Merge "Import translations. DO NOT MERGE" into mnc-dev am: d1628307b0  -s ours am: c1189dba33  -s ours am: 8996236eb1  -s ours am: 2ba5c50524  -s ours am: 1cd94a1294  -s ours
am: c82270a605  -s ours

Change-Id: I1122655fa8074678d78ece4ad9a1324d2e068553