Merge "Apex: fix log uploading"