Merge "Enforce boot and vendor patch level format always"