Fixing build issues introduced by introducing a static inner class to keep track of device related properties