Changes for device_os_version bug