Merge "Logd: Handle unused variable and fields"