Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev