Merge "Annotate other support library tests" into mnc-ub-dev