Merge "Remove unnecessary JsName annotations" into udc-dev