Merge "Handle 9patches being used for frros" into main