Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3  -s ours
am: 500e07de70  -s ours

Change-Id: I2d593fdb256d9e4284e36b0f729b778742cb172f