Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448  -s ours
am: c0ccea9bf5  -s ours

Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4