Merge "Add annotations to a new API" into mnc-dev