Merge "Add statslog logging for hidden api usage"