Merge "Import translations. DO NOT MERGE" into pi-dev am: 0c0c287cf4  -s ours
am: efbab67caf  -s ours

Change-Id: Id9adc313d038cec3addb7fe6f8896b30ff04316a