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

Change-Id: Iabe27e06da90e5829f3fbb6d73932e47a60475e6