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

Change-Id: If559097d398446f5f2f8181ac608c6458c099fb2