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

Change-Id: I3602663beecc8afd50f2eb442a39e69a655e1d48