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

Change-Id: Id608d1fe761cedd49babfa729f9fd4cac39729bf