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

Change-Id: I982ed94bacbe316d1633fa30bb8b6b315ebf2354