Merge "Configurable sample rate for hidden API log events" into pi-dev