Merge "Import translations. DO NOT MERGE" into mnc-dev am: 64da597a30  -s ours
am: a5726284f6  -s ours

Change-Id: Id31a603a1401199a52a91dda45b36a1bf28294a7