Merge "Update Javadoc to clarify which calls are logged." into pi-dev