Merge "Fix lock held error when setting DO for AAOS" into tm-dev