Merge "Apex: Fix OS_VERSION detection"