Merge "Fix set-device-owner from shell for AAOS"