Organize annotations; change annotation expansions#2449

helsaawy merged 1 commit intomicrosoft:mainmicrosoft/hcsshim:mainfrom

helsaawy:annotations-orghelsaawy/hcsshim:annotations-orgCopy head branch name to clipboard