[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d6df52e22f  -s ours skipped: 7f649e7e6d
am: 5cd687505a  -s ours

Change-Id: I08621df252756495257329a271cc6daed40605c5