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

Change-Id: I73205ca0caf9c6e4979b637edb6a7f73070a14c1