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

Change-Id: I277c27aa9c48bcd4c054060c0c6df9c176df044a