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

Change-Id: I37bee234c157fb99a4255e49c04a8d3468968cef