Merge "API: Log usage of action=tokens"