Merge "Fix timing issue in CmHandleCreateSpec"