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

Change-Id: Idb282bf92a29e51b916a32dcbc98a507bb5d295d