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

Change-Id: I1839f0d71dd9cdae5d473aa423643565b80b5285