Merge "matrix: Enforce kernel requirements in OTA only when flag is set."