Merge "Pull in upstream fixes to reject invalid bases."