Merge "Import translations. DO NOT MERGE" into mnc-dev am: f505218d9a  -s ours am: d9817ed155  -s ours
am: 66fe0e93ed  -s ours

Change-Id: I858f5c750f04efd37ba34f836f127642ab9c90e5