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

Change-Id: I29e3d0bd899b9abbed835105fc12d484b7717b45