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

Change-Id: I1e65c727225c0c7ff2dfa6b6c5a70b8b94290eee