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

Change-Id: If4bb675fd474325584631c64102d32f10963fec8