Merge "Baseline NewApi issues" into udc-dev