Merge "Make os_version optional for StrongBox"