Merge "Improve performance when resolving persistent log file" into mainline-prod