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

Change-Id: I728dcfc27c89c3f9d494b06d1a09625e6b33b085