Addressed comment regarding the requirement of deviceUUID