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

Change-Id: I5c472506d02ff9a808c0c0d0ba7a77910d7bebab