Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f  -s ours
am: c81e5ae281  -s ours

Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa