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

Change-Id: Ibcd4c5627e0a7fb62fd32374debbfb4f52bc52d9