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

Change-Id: I3f49b2c3308dcdcfe59cbc54d803d236a576e756