Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev