Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873  -s ours am: a62eff1f94  -s ours
am: 80d94130f8  -s ours

Change-Id: Id2204c1c0652979a96d27fe4d90ff606d753fed7