Merge "Protect system APIs based on feedback." into udc-dev