Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e  -s ours
am: f7a5a3b0ce  -s ours

Change-Id: Id10ecb75e1fe67ff44ef1e27ed1f18eb326c353d