Merge "Add @Documented to various support annotations" into mnc-ub-dev