Merge "Updating Trusted Device Enrollment API" into qt-dev