Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours
am: 7cb6513f6d -s ours
Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958
This commit is contained in: