Merge "Work around missing microversion headers on /"