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

Change-Id: Iff4d29701c6e127938f310e52ed04f8ab6d2a8d7