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

Change-Id: I3c99e350f7130ea39ac29751f104fafc04dde0d2