Merge "Remove custom annotation libs" into sc-dev