Merge branch 'const_of_device_id'