Merge "Add prebuilt_etc for consumerir feature xml" into main